Merge tag 'upstream/2_rc2+svn400' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 1 Apr 2012 03:02:18 +0000 (06:02 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Sun, 1 Apr 2012 03:02:18 +0000 (06:02 +0300)
commitf9dccb31b65ddc12d891297f21ead219aacdad36
tree64e36f3167ff4abf213751311c15654fbf454021
parentda2c813765ee86a984c47f4380db9b60e031299c
parent47979c704285b468112b571c36632df0e799a358
Merge tag 'upstream/2_rc2+svn400' into experimental

Upstream version 2~rc2+svn400

Conflicts:
lang/CMakeLists.txt